Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 26 Jan 2011 01:58:11 +0000 (17:58 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 26 Jan 2011 01:58:11 +0000 (17:58 -0800)

Trivial merge